Merge in Matt's changes

Make the program much more user-friendly