more questions answered  + refactoring of Q3