Fixes, comments and tests
Remove target dir