updated repo with fuzs latest changes