fixes, stuff  (sorry)