Fixed some grammar + a few simple bugs