Third upload

More changes and updates