Fixed all manner of mistakes.