Added Solar Energy. Some typos