unit converter fix

added more methods and removed angular conversions (see comment in code).
defined all the magic numbers to macros.