Made output more consistent between different modes
+ Added support for printing different prices
* Random small fixes in different files