Add content to sample + fix bugs