Some finetunes in the example project