directory changes + more fixes