Cleaned up and added more information.