fixes clean up new stuff etc etc