new items, dialog fix, other stuff
merge