lots of bug fixes. some test shapes.