fixing lots of things