improvements on several parts of R7 release... still a lot of work to do