fixed first contact, still other bugs