-Taxes sould work now
-Resolved some bugs