Yo

crash fixes