resolved remaining issues