Minor modifications, and added temperature equation to main