fixes

- some fixes
- remove directories