Follow me mode additions (Issue #299)