backup
smiles tests now pass as well
some code cleanup