Fixes and tweaks, added pv