Fixed cosmetic problems, new lights

ready for fullcompile, cubemapping and testing