Tidied up the source, but still nothing is really finished.