Transferred and added changes from the master branch, which were not enough for the explorer to work.