added some more changes
final fire mods. still slow *sigh*