Sundry improvements - including imports script