misc updates

wire fixes and other stuff