finished state machines for catch and load + bug fix