javadoc comments for the timing parts
renamed a model handling rules class
fixed issue in the conflict sets resolution