A few more quick additions to the code. Nothing major.