small fixes and new items added