moved weight calculation into separate function and fixed bug with wrong...

moved weight calculation into separate function and fixed bug with wrong distance calculation, also little modifications to tests