small changes here and there
prep for adding IMPORT and EXPORT