Bug Fixes, Improved Commenting