More Shapes

Added more shapes and fixed code.