more fixes omgwtfbbq