corrected typing errors
corected wrong storing order
minor fixes
Merge branch 'feature/AddSecondCalculationPeriod' into liveSystem