minor general enhancements

comments and todo updates