- some fixes and optimizations as well as continue refractor the code.