herkou and fixes