Bug Fixes, and more comments.