changes to models & admin