Pull latest from icefox

Bringing in the latest updates from @icefox