made some changes to fine tune grid a bit more
cleaned up a bit