flesh out more content, fix some more things from Tracy