small tweaks and cleanup.. RELAY DOESN'T WORK STILLLLL