progress on interrupt issues, see #167