more compilation errors fixed. wip.