Added samples and did some minor changes