Cleaned up some model code, fixed validation in question model