Minor updates. Still just playing with ideas.