Line em up

Fixed code indents, etc. Prompts now exit on error.