fix underscores, etc