bugfixes and refactoring static classes into own jar