added tax table and fixed a bug