revised registrierung; closes #14, closes #19 and closes #23