Version 6 fixes + features