Small tweaks to prepare for new functionality.
made some TODO's