added status, better input handling, more switches