s/segfault/abort/ and some whitespace fixes