Some testing & small improvements. API getPrice bug still not fixed.