fixed item counts and a few issues