new changes even if it's still not working, it corrects a few bugs