many fixes, accounts and sessions planned but not completely done