improved log messages
fixed cleanup directory error