minor tweaks and get rid of the linker dependency I used for testing