finally nailed some of the regexp magic..  :)