Second commit after correcting some minor errors