WS fixes + RM old comments + missing ;