More checking of user actions + simplifications with model creation