Finished calculations, and added all comment lines