Many fixes and additions.