Added help message and short versions of options