Incremental changes

Have made corrections where applicable.