Format changes and random fixes