Variosu fixes and better input validation