Fix  and free things I should have already