add some minor stuff
elpa
merge?