two bug fixes and two formatting suggestions