Removing and adding a few things.
more clean up and some new functions