include correction on xxx/eye/xxx
simplifying calls to funnm, logm and deconnenting tests