fix errors and add better user experience with proper payment structure

initial commit