removed debug values
removed tax when there is no tax