add support for Nicknames, misc cleanups