Obstacle building fix + minor grid bug fixed + waves implemented