Many fixes. Few Worries