small tweaks, more samples