remaining issues fixed except related to mail and blocked time out