Final fixes and bogs, finalizing multiblock code, Next: AFT