minor syntactical changes
fixed errors in modules import and export