Cleaning
New onset/duration instances (fixes #1)