Minor updates per feedback on g+