Did some more updates