made Illustrations generic and updates to logging in the cleints and updated tests