Version 7 fixes + features