pricing table fix + other small fixes