minor fix + work on examples