compile fixes only, tests still WIP