added more shapes; improved auto-rotater