Made more fixes as per WIP comments, added GridSnapTest