target latest potemkin, fix a few things here and there