small changes. Pcker doesn't work yet.