Major refactoring of database structure (unfinished)
Fixed a few bug + comment clean-up