add intensity to yml, some code cleanup