Bugfixes and gag updates