Lots of fixes and refactoring. New Excel class.