Added rotating lamp, fixed lamp update issues