lot of changes ... got rid of the anaphoric macro, did init-fns, etc