small changes
change shortcut into fullname flag