fixed backlinks + refactoring