Better handling of missing battery and configurability
Update todo