optimizations and bug fixes
bug fixes and working on listing and item