improved/added comments
added setter/getter for the conditions dialog