More changes and beginning crash fixes