Bugfixes

mostly about SIFD-60, some other bits.
didn't do this, only added a better comment.