 * Added some crashfixes
