Bug Fixes and Commenting Code