More info, formatting improvements