update fork with some fixes