Bug fixes

I realized how many I had…now they're gone :3