inor improvements