[programmarchy]

By implementing #1 and #2 seems like you would still have a layer of protection even if your master password get key-logged.