misc changes pt 1