Code documentation and some more constants.
Removed delay from collector thread
Merge remote-tracking branch 'origin/master'
Code documentation and cleanup