cleanign up
fixing https issues