lot of mods

* will edit *