add some fixes
start