fixes..lots of them