Various cleanup, including filling in profile.