spacing on grid and pricing stuff
merged conflicts