minor Fixes & Comment Cleanup