some stupid mistakes sorted we shouldn't have made