Comments Fixes