fixed a fair few crashes