added TSprep and updated atom types