A few layout changes, more info for users, ntcmarshal details