fixed lots of capture problems