Comparation and other small fixes in custom module.