Too many things to remember

fixed a lot