add pyjama visitor and misc