rules add, minor fixes