Fixed item comparison. Cleaned up listing