Various tweaks

Let me know if you need me to make any changes and sorry for not making separate PRs but I made the changes quickly.