added in some previous changes

Did these additions before the github repo was made. Copy and pasted
them in fairly carefully, so it should work. Also some minor tweaks to
the readme and some other files