* more compile fixes, compiles now