fix fucked up commits

ACK manager now working properly, I messed up with the branching.