fix some rules; add options