Fix tabs bits and bobs mostly misc.