Fixed minor bugs, all protocols should work now

Testing topics is up next (another night)