Minor changes and updated help