misc cleanups
lots of reworking of spares model