Simplified upper floor geometry, tweaked basement lights