All done with the grammar modifications, ish

Will probably need to add parentheses and stuff in there