Minor changes and updated user guide