Fix minor bugs, add correct currency symbol