Finished changes and corrections