Pulpv2: Making some tweaks based on feedback