fixes #200.
fixes #197
Merge pull request #204 from jfarid27/light-fixes

Light fixes