Transaction fixing

@mhahn merge in. Fixed some category issues