apply changes
fix linker errors