Fixed vault for teleport commands and reviewed TODO's