add: python and modules, plus cleanup