Moved things, added link stripping