Done some more optimization, not finished yet. Debugging has to be done at work