Added a few items, + bugfix