development: better comments