Prototype 1.1

Some crash improvements
Weird

Not sure why these files were missed...
Some crash fixes