Added match to flexlists and added different types of rule fields and types to Rules
tests and things