reworked and pieced out some things to other mods