Scene improvements and bug corrections