CR fixes complete except the js OO