lamp on mode as well as some naming issues fixed