meeeeeer fixes