upkg, fixed some stuff