fixing bloom lighting, other small shader changes
merge errors