code and grammar tweaks