Added rc-file support.
Minor changes...