fixes for review, plus adding two additional modules