A bit of cleanup
Added some rollup bits, fixed some bugs