Changed directory finding and other things