Final changes to Xcarriage and fan stuff