added comments and annotations to the database models
fixed a couple merge issues, it all works properly