Localize libs + minor changes

most libs were made local.
Some changes to test “researcher” test screen.