Many updates. Mainly on the light adjustment to certain levels. + some
renaming and organizing of imports.