refactoring and and battery_time shows time until charged (closes #44)