more cleanup
added more combinators
update to newly released free
code cleanup, bug fixing