@sparkeddev: A few changes