quickly fix quick fix
more robust defaulting for output modules dir
remove obsolete method
fix TODO
remove unnecessary hardcoded default