Worked on #517 many changes for taxes and items options