updated some module references
added a TODO