Add Help and debug some bugs