Added z jumper and did some clean up