Filling out a few more things