couple minor tweaks to avoid warnings
use ack instead of grep
few minor tweaks -- add couple more faces to doc mode
why having to merge in changes here