More parts of the last commit.

Don't know why these didn't get included....strange