Cleaned up, and added to. More coming.