Some mods and better formatting.