fixes
b8 support
bugfixes
todo