Part one of block manager cleanup (well, more like part 2)
Part 2, change loading
All done now :)
Update changelog
Misc. cleanup