Config melpa updates and some small fixex