bug fixes (undefined links names)