A few tweaks while running core_cx
Merge pull request #11 from mistercrunch/tweaks

A few tweaks while running core_cx