Went through it once more and made some changes

Might be BD ready, but I want everyone to take a look beforehand.