working dir bugs to fix.