Bugfixing, refactoring, renaming to idvtek