fixes of stuff