so many details to fix still