Added comments and fixed some of the transacationl stuff as well as the messed up annotations for jpa