Patch 3

Review of battery status check.  See detailed comments in commit c1e6db4.