More changes

Can't forget to version control.  >=/
Fixes

Botched it!