various more fixehhh