fixed it mostly