minor todos and comments