added a bunch of completion magick and keybindings
fixed syntax hightlighting broken from last commit