Optimizations, bugfixes, and so on