Improvements in scripts

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>