tape - paf and gizmo updates

worked on a while ago but didn't commit for some reason...