Polished a bit moar, fixed data model inconsistencies, etc.