changes in condition and tests
moved things around (from rule to condition)
fixed shit etc
quite some small progressive modifications