Added item parsing + minor fixes