more questions added, security section, refactorings