Some improvements, preparing an ALPHA release