Fixed reset logic so augmenting new photos will reset the state of the app;
Other assorted bug fixes;