More optimizations + changelog