Lots of updates to new CSTools app