remaining issues fixed