Small bug, formatting, comment changes