Removed a few warnings
New style transaction blocks
Removed automatic todo