more compile time fixes.. still have a linker error though.