claning directory & fixes