fix pub and some stuff
.
.