Last changes

Slightly corrected comments. Applied Joern's changes in my branch.
Merge pull request #1 from numixproject/nos-panel

Started nos-panel
Merging Upstream stuff