- minor updates and cleanups here and there, trying to come up with correct logic for project + cmodules