Added user lookup (currently though a hard-coded map.  Also cleaned up crlf a bit.