Fixing grammar and more