Minor comments + sberger/pvp wip
sberger