updated some links + bug fix