Added the rest of the lamps and made some tweaks