Bug fixes, ensure BC, range in km and m