Fixed links
Moved important things from cache to data