more pats
more pats
more pats
fix escape
few style changes