0.9.5.2

some clean up, minor edits & removal of duplicative rules.