some fixing stuff