Fixed #70
Fixed achievement issues.  Iteration in wrong order.