fixes + debug stuff