Add surround + repeat plugins. Update mappings.
Don't leak variables. Show exitcode on error.