ItemManager and AccountManager fixes, overall changes