Worked over some small bugs that have been coming up

Spitfire slowly is getting more and more stable.