Fixes, validation, usability improvements