Bug fixes and working on new Items