Smalll fixes.
Parsed database. Refactoring.