Still Joking: Patch 8.1

Performance tweaks and minor bug fixes