A lot of minor changes/fixes/adjustments tonight