-- changes and enhancements in validation and saving