little changes and additions to the funcitionality