fixed battery level and used some objects elsewher

fixed battery level and used some more objects elsewhere
Merge branch 'John'