Added one-var and sorted some rules