mostly fixed item bugs, could use some tweaking probably