bootstrapped with several optimizations and recent bug fixes