bugfixes and added atom types