Cleaned Dirs. Fixed bugs