todos and small changes (comments)