fixed a lot of stuff that was wrong since I did not have time to test it yesterday