fixed errors bringing this up to V1.1