Merging small changes to working version.