Imporvements

Too late for witty titles.