hdocs branch with some fixes