More changes and tweaks; Tests are all passing!