add comments and fix magic strings