Tx works, some fixes in rx