Fixed more bugs, this time with commit-based comments.