Tests and tweaks
Styling changes
Merge