bug fixes, layout ironing, comment edits