space and other minor changes