Bug fixes, new sample files added