More mostly working

Few bugs fixed. Seems to work given one receiver