cleanup example a little
add bindings for more shapes