fixed some bugs
try rebase