small fixes
woo
Clean up. Improved CommentBase error handling.
Clean up2.