Added TODO messages and revised comments.
Added TODO, revised comments, added servcounter usage for the database.