including high seas and fixes in bbest repo