Fixed most blockFormat scenarios that would result in broken code