some tweaks added from masteringemacs.org