enanched citations + some fix