Comitting various small changes.