fixed linker errors
more 3AC progress