models cleaned up and comments updated.