Minor updates and modifications