cleaned up code, added more fields for create