Fixed a few light bugs