Alterando links e corrigindo bugs. #fixes #2