Bug fixes, relay should now work