a lot of fucking fixes