Major bug fixes, work on windows directory descent