tweaks, updates, and cleanup to batter monitor