+ fix multiple source directories support
+ fix restore options
+ add source myvars for easy testing