Reverted to old lighting system
Minor changes
Tidy up