add/remove some todos
rename a constant.  thanks Roel.