Bunch of Bugfixes

Bugfixes and Merges produced by yesterdays hacking to the new gif player