Nikhil Murthy's Syphilisation: Bugfixes

You know the drill.