fixing stuff!