more fixes, now compiling.