Bug fixes speed up and some code refactoring