bug fixing and harmonizing platforms API