Minor fixes and unneccesary pedantry.