Removed comment clutter. Fixed some warnings.