Update item.* and fixed makefile