Tweaks. Add a couple tests.