added white space highlighting and prevention of buffer switching warnings