contact module and various fixes