Polish comments.
Reflect change in database scheme
Preliminary setup functions