Some last fixes before a stable update.
Never a simple update. This is going to help a lot of people.