Minor updates with more code