bug fixes + adding new items works