CPU usage improvements

CPU ranged from 20-27% on test platform, now down to 2-5%