Small fixes

Added comments, TODOs, etc.