add more labels
break up init.el
misc improvements