annotation + code OCD
improved warning message (slightly)
1 more TODO