Joachim Fasting * updated for repa 3 * minor fixes