some improvements of main app, test app of the windmill added