Fixed some stuff in a panic (I hope it was fixing that I did...)