level improvements and minor fixes