Various updates made a while ago