Added feedback, cleanup, and simplified modes