Version update
Minor fixes
Speed optimizations