[@Lugubrious]

So I have made some changes, so let me know if I need to change anything else.