-
Clean up + added simple battery handling.