Cleans up a bit, adds options for iterations