added some tweaks, changed some examples