omg i forgot to commit for a few day.

here are bulks changes i made these few days