More changes as I slowly clean up and evolve this.