Whole bunch of changes to improve usability