fix id for kleisli
clean up
sanitize imports
add arrow-choice to heirarchy