Minor improvements
Tended to some crashes here and there