some refactoring and a minor fix for the carbon floolight gui
Merge remote-tracking branch 'origin/master'