Minor updates
changes merged