cleanup, + added code to set directory status to todolater