Improved comments, flux calculation, plotting