fix hbstamps waiters
fix pg floor tracking
wip