fixing stuff...