Merge pull request #182 from kigeia/unstable

Remove some debug output and comments
Optimize label update