New modil impl. fixes, still needs work