WS fixes + RM old comments + missing ;
Some personal mods