comments and small fix