Problem with comma before series

Hi there,

I am trying to set up jurabib (thanks for this great thing) for my needs. Although I hacked 
jurabib.bst it's still working fine ;-)
My only two problems are:
1. I changed the position of the series-field to: Author, Title, (=Series), Address Year (as 
proposed in an earlier thread or newsgroup via putting format.series.number before  
format.address.publisher.year. Now there should be *no* comma between Title and Series 
- how can I get rid of it? (There is no comma though after booktitle, if it's incollection)

2. Why do I get a full stop after the editor?

Thanks a lot in advance!
Peter

P.S.: I'm using the latest beta
P.P.S.: Here comes the minimal example
\documentclass[12pt, bibtotoc]{scrreprt}
\usepackage{german}
\usepackage[german]{babel}
\usepackage[utf-8]{inputenc}
\usepackage{ae}
\usepackage[T1]{fontenc}
\usepackage{jurabib}

\jurabibsetup{
	citefull=first,
	 authorformat=smallcaps,%
	 authorformat=firstnotreversed,%
	 titleformat=italic,%
	 titleformat=all,%
	 titleformat=colonsep,%
	 ibidem=strict,%
	 bibformat=ibidem,%
	 superscriptedition=year,%
	 pages=test,%
	 pages=format,%
	 nopublisher=both,%
	 see=true,%
	 edby=true,%
	 commabeforerest=true,%
	 annote=true,%
	 lookforgender,%
}

\AddTo\bibsgerman{%
	\def\Edbyname{\space{}hrsg. von}%
	\renewcommand*{\ibidemname}{Ebd.}%
	\renewcommand*{\ibidemmidname}{ebd.}%
	\renewcommand\bibidemSfname{Dies.}%
	\renewcommand\bibidemsfname{dies.}%
	\renewcommand\Volumename{\space{}Band}%
}%

\renewcommand*{\bibbtsep}{in:\space} 
\renewcommand*{\bibjtsep}{in:\space}
\jbedseplikecite
\jbnoformatafterstartpagefalse% 
\renewcommand*{\bibatsep}{,}% 
\renewcommand*{\bibbdsep}{}% 
\renewcommand{\bibapifont}[1]{\glqq #1\grqq{}}%
\renewcommand*{\bibtfont}{\textit}% 
\renewcommand*{\bibbtfont}{\textit}%
\renewcommand*{\bibjtfont}{\textit}%

\renewcommand*{\jbbtasep}{ und }%
\renewcommand*{\jbbtesep}{ und }
\renewcommand*{\bibbtasep}{ und }%
\renewcommand*{\bibbtesep}{ und }
\renewcommand*{\bibaldelim}{(}
\renewcommand*{\bibardelim}{)}
\renewcommand*{\artnumberformat}[1]{\space{}#1}%
\renewcommand*{\ajtsep}{}

\makeatletter
\DeclareRobustCommand{\numberandseries}[2]{% 
     \unskip\unskip\unskip%
     \ifjb@jox\else\unskip\fi%
     \space\bibsnfont{(=~#2, }% 
     \ifthenelse{\equal{#1}{}}{)}{Band~#1), }% 
}%
\makeatother

\begin{document}

\chapter{Test}
1. \cite{Hirschmann:1998}

2. \cite{Snyder:1989}

3. \cite{Sandberger:2002}

4. \cite{Edler:1990}

\bibliography{some-database}
\bibliographystyle{jurapit}
\end{document}

P.P.P.S.: And some Bibitems:

@book{Edler:1990,
	Address = {Kassel},
	Author = {Arnfried Edler},
	Gender = {sm},
	Number = {35},
	Publisher = {Bärenreiter},
	Series = {Kieler Schriften zur Musikwissenschaft},
	Shorttitle = {Dietrich Buxtehude und die europäische Musik seiner Zeit},
	Title = {Dietrich Buxtehude und die europäische Musik seiner Zeit. Bericht über das 
Lübecker Symposion 1987},
	Year = {1990}}

@article{Hirschmann:1998,
	Author = {Wolfgang Hirschmann},
	Gender = {sm},
	Journal = {Die Musikforschung},
	Number = {51},
	Pages = {70-73},
	Title = {Heinrich Gottlieb Schellhaffer als Textdichter zweier Lübecker 
Abendmusiken},
	Year = {1998}}

@incollection{Sandberger:2002,
	Address = {Kassel},
	Author = {Wolfgang Sandberger},
	Booktitle = {Bach, Lübeck und die norddeutsche Musiktradition. Bericht über das 
Internationale Symposion der Musikhochschule Lübeck April 2000},
	Editor = {Wolfgang Sandberger},
	Gender = {sm},
	Pages = {43-59},
	Publisher = {Bärenreiter},
	Shorttitle = {Bachs Reise nach Lübeck},
	Title = {Bachs Reise nach Lübeck -- zwischen Mythos und Wirklichkeit},
	Year = {2002}}

@incollection{Snyder:1989,
	Address = {Kassel},
	Author = {Kerala J. Snyder},
	Booktitle = {Studien zur Musikgeschichte der Stadt Lübeck},
	Gender = {sf},
	Number = {31},
	Pages = {63-71},
	Publisher = {Bärenreiter},
	Series = {Kieler Schriften zur Musikwissenschaft},
	Title = {Lübecker Abendmusiken},
	Year = {1989}}




-- 

Please remember -- this is an international english speaking mailing list!

If you have a problem, please provide a complete minimal example document (with a small bibliography database), which runs out of he box without any superfluous packages loaded, otherwise we could not help. 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/jurabib/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/jurabib/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:[email protected] 
    mailto:[email protected]

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/