Work on shapes code. Fixes.