Adds usrp2.sink_32fc, usrp2.sink_16sc, refactoring, cleanup