Lot´s of changes to fix Bug and to improve the setup