Moved some blocks into the power tab and fixed some minor issues