Improvements to free slot counting

Problem still exists, once engine is added to torso, slot counting is
wrong.