cleaning up, adding fields to db