merging svg/feedback/timing changes