more commenting in code and configuration