Fixed a major mess-up (possibly caused by vim file recovery?)