brush ups and minor fixes