added samples update + minor tweaks