Major cleanup
More formatting
Added terminal support (options)