fixed some mode6 issues

fixes #77
fixes #39