Finetuning for first beta release