Nicknames. small tweaks