Couple of odds and ends, plus changing the way that functions are imported.