moved non-running rules into unintegrated; fixed some rules
moved non-running rules into unintegrated; fixed some rules