fixed up item menu. a few minor cleanup items