Add NICK parsing, clean up quotes