Fixed several errors. More still to come.