Fixes and upgrades 6-3-14