tweaks, started adding more rules