Rearranged packages and fixed score per trip calc