Fixing and adding a bunch of things!

Relay works as intended,