Aug 5th backup
Small fixes and comments