bugfixes (sampling, timeline)