WIP: fixes and clang comments