Updated samples and small tweaks