Internal changes

This is just an internal release:

• Standardised the battery types and their particular characteristics via a new class throughout, so adding new types or changing values are easier to do.