minor changes, still a ways to go