Some mods from stuff I did and from reading over the latest