Added object grids, fixed comments, added todos