various core issues fixed