Ville Pihlava

## Proposed Changes - If something was too complicated, I didn't try to fix it. - Some of these changes are plain improvements and some may be considered stylistic choices.