added password check
moved export to new func layout
fixed export csr option
cleanup