V6fixesii

A couple fixes necessary on top of the previous v6 merged branch. This isn't complete yet, until @kwadronaut is able to test the latest.