fixed all linking issues