Minor changes and sample help