working hard fixing all these issues