Fixed 'nickname' clean-up, other minor changes