minor changes and deletes
small changes
minor deletes