final bug sweep, fix validations