Cleaning up

Plus some corrections and additions.