fixed some light bugs + reeanble logic that i commemnted