fixed transmit issues
merged changes