Alright, changes made. Hopefully satisfactory.

Edit: Fixed another bit related to magic items that I missed.