Bad GM *smacks self* 

All fixed/