Update things

Continued code tinkering.