updated some model and controller stuff