handle SubjectActions nicer

also adds some design TODOs