Add completion routines and some path additions