small mod fixes #31, also realized that new mods fixed #1'