updated Convertor

fixed power and mass conversions
updated Convertor

updated settings menu, some other small fixes