Fixed integer issues, and updated PV UI