NullTerminator aspect; some minor changes.