Updated to Flaminsarge's latest files

I think.