Better controls + infinite water