buggy links removed + alert code managed