more fixes for emacs24 + get rid of all the tabs