pins, layer test, choppy fix