Final changes before new alpha release