Fixed up substitute command and added to list of exports