minors and fixes