Fix a few more issues resulting from "nelements != atom->types"

this also detects in a more safely fashion, whether there is data in the second part of the input file, that is still formatted for he first part.