final changes before mike works on it

Changed things should be good to go. Mike go for it.