more standardization and module updates