Okay fixing some small inconsistencies. Buuuut it's done and fixed and should be good!