Did some needed updates