Pre-Alpha 4.31

Some small bugfixes.