Updated code and models

+cleanup