battery monitor, and more ui modifications
more stuff
even more merging.  ugh