[WIP] Some enhancements to chemical shift tools