Fix throttle locks and pending member functions
lock fixes
finished basic tests