Added validations for jobs and users, fiddled with calendar stuff
Fixed conflicts