major transaction fixes