vponline

@hellicarusprime fixes have been applied, please check again 🙏

Are there any further changes required to get these accepted please?