rename protected to torlley and minor clean ups