comments, todos and minor cleanups