Added stuff missed from first commit.