various changes
Merge branch 'rework' of https://github.com/plum-umd/rtc into rework