fixed linking issuess
fixed linking issues