Clean up battery status, fix wrong time estimate