Fix #7, #8, polish examples