And some other optimizations, ready for release ;)