Refactoring; Bug fixes with TrueCrypt commands