Weyand: more logging, dsl improvements, stubbing.