fixes of stuff and stuff