fixes
minor fixes
upgrades for ease of use