Add NTFS support and some fixies