update with comments from Justin
few updates