moved cmd lines to vars
updated variables