..and fix other stuff