Updated with bug fixes

I don't remember what I changed....see the highlights