Iteration 1.0 tweaks