made some additional model and admin changes