A few fixes 

After testing a bit, I found some stuff that wasn't working quite right. I think I fixed everything though