Fork updates from team SennyC2 + my own