fixed .. along with a few other places