added jumper support and a few null fixes