Refactoring, Improvments, Bugfixes