Added Crosslinks
Bugfix
Bugfixes + Improvements