Minor Additions

Still working on the python version.