multiple issues fixed