Add walls and collisions (mostly) looking natural. Close #29