Tweaks

Needs more work, but it's getting there