Minor cleanup
Fix dispenser crash
Add light-blocking glass walls