Tweaked commands so that vim's indent doesn't get in the way as much