Some comment changes, function stubs