Bug fixes related to clearing data

No longer crashes if BathData has nothing