some light fixes
some light fixes