Some lights and other minor changes