Bug fixes - save now works properly, and error messages are betterer