Updated all samples, still need to comment a couple