Altnickname support / Updated TODO