Faster level increment + bug fixes