small mods, preping for v1.8 for studio 11