mini-issues fixed