some fixes. use this version its good.