More Formatting things, still not quite done