Updated for my new additions for emacs
Updates for a crazy amount of stuff