bug fixes

still need to get it to compile, tons of linker errors