Numerous small changes. I need to try to modularize my changes into smaller commits in the future.