fixed rule simplify/fill bugs.  cleaned up uncessary rule to cluster conversions