Updated the rest of equations. Other minor fixes