more elaborate example, minor fixes