Aegislash fixes

So many things wrong with what I had...