Tax info + sql changes