assorted changes
i thought i deleted this file...