RC2: speed-ups and CS changes
Merge pull request #371 from terrafrost/rc2

RC2: speed-ups and CS changes

* terrafrost/rc2:
  RC2: speed-ups and CS changes