Some fixes and added Items