lots of necessary changes per wordpress feedback