Push switch holes removed (unnecessary), re-routing and error fixed