fix module labeling and global params