fixes cleanup shit new stuff etc etc