Enough hasty 3+am commits for tonight. Exntesion fixed, again