Added comments.
Removed testing print.
Fixed typos.
Merge branch 'database'