renamed stuff and made lights better.
Merge branch 'master' into csv-branch