code cleanup, still workin on harpoon multi logic