some mods

doing a pull request here