More refactoring, light fx
Merge branch 'master' of https://github.com/OIIOIIOI/LD29