updates and minor style adjustment