fixing stuff...
more fixing