cleaned up imports, worked on unifying linkers