lots of little changes, optimizations
Merge branch 'master' of https://github.com/shib340/PCNS_Test