some fixes
Add error