cleaning up and fixing stuff