Changes to pull

added + fixed a few things.