some rectifications after testing