Tweaked some tiny things. Relocation commit.