(Hopefully) fixed a few problems!