Fix halos and lamps
Merge pull request #631 from robotboy655/patch-1

Fix halos and lamps