Merged kheldysh suggestions, fixed small errors
Added stopper for over counting prices