Crypted I/O part 2 & some other small tweaks