add lestari, some fixes