fight stuff, some map things and better perfomance