Various updates I made a while ago