Added a few features from molecule.py