fix some stufs