wmotables comments and bugs fix.